Autogenerated HTML docs for v2.11.0-485-g4e595
diff --git a/git-diff-files.html b/git-diff-files.html index 1f2f2ff..b113461 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1464,12 +1464,51 @@ </dt> <dd> <p> - Output the patch in the order specified in the - <orderfile>, which has one shell glob pattern per line. + Control the order in which files appear in the output. This overrides the <code>diff.orderFile</code> configuration variable (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderFile</code>, use <code>-O/dev/null</code>. </p> +<div class="paragraph"><p>The output order is determined by the order of glob patterns in +<orderfile>. +All files with pathnames that match the first pattern are output +first, all files with pathnames that match the second pattern (but not +the first) are output next, and so on. +All files with pathnames that do not match any pattern are output +last, as if there was an implicit match-all pattern at the end of the +file. +If multiple pathnames have the same rank (they match the same pattern +but no earlier patterns), their output order relative to each other is +the normal order.</p></div> +<div class="paragraph"><p><orderfile> is parsed as follows:</p></div> +<div class="openblock"> +<div class="content"> +<div class="ulist"><ul> +<li> +<p> +Blank lines are ignored, so they can be used as separators for + readability. +</p> +</li> +<li> +<p> +Lines starting with a hash ("<code>#</code>") are ignored, so they can be used + for comments. Add a backslash ("<code>\</code>") to the beginning of the + pattern if it starts with a hash. +</p> +</li> +<li> +<p> +Each other line contains a single pattern. +</p> +</li> +</ul></div> +</div></div> +<div class="paragraph"><p>Patterns have the same syntax and semantics as patterns used for +fnmantch(3) without the FNM_PATHNAME flag, except a pathname also +matches a pattern if removing any number of the final pathname +components matches the pattern. For example, the pattern "<code>foo*bar</code>" +matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p></div> </dd> <dt class="hdlist1"> -R @@ -1553,6 +1592,8 @@ <p> Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. + Defaults to <code>diff.interHunkContext</code> or 0 if the config option + is unset. </p> </dd> <dt class="hdlist1"> 